gpg: Do not try the import fallback if the options are already used.
authorWerner Koch <wk@gnupg.org>
Tue, 9 Jul 2019 09:13:51 +0000 (11:13 +0200)
committerDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Thu, 22 Aug 2019 19:11:59 +0000 (20:11 +0100)
commite988a161328782dbd073e0ccebf5ca2dbdabba6c
treeb97683cf1b47525f92fed91a38f7d57aba7a37ae
parenta7f4425fa36eed002fa92dd6f9e0012890717399
gpg: Do not try the import fallback if the options are already used.

* g10/import.c (import_one): Check options.

Signed-off-by: Werner Koch <wk@gnupg.org>
(cherry picked from commit 3c2cf5ea952015a441ee5701c41dadc63be60d87)

Gbp-Pq: Topic from-2.2.17
Gbp-Pq: Name gpg-Do-not-try-the-import-fallback-if-the-options-are-alr.patch
g10/import.c